:art: Ranks
huangqimin001
1 arquivos alterados com 15 adições e 1 exclusões
+ 15
- 1
api/eqpt_views.py
@@ -254,8 +254,22 @@ def get_screen_data(point=None, point_id=None): |
||
| 254 | 254 |
'observed_days': eqpt.get('observed_days', 0),
|
| 255 | 255 |
} for eqpt in eqpts] |
| 256 | 256 |
|
| 257 |
+ # 排序：发烧 > 未上报 > 时间 |
|
| 258 |
+ eqpts_fever = [] |
|
| 259 |
+ eqpts_not_upload = [] |
|
| 260 |
+ eqpts_other = [] |
|
| 261 |
+ for eqpt in eqpts: |
|
| 262 |
+ has_upload = eqpt.get('status')
|
|
| 263 |
+ temperature = eqpt.get('temperature')
|
|
| 264 |
+ if temperature > settings.FEVER_TEMPERATURE: |
|
| 265 |
+ eqpts_fever.append(eqpt) |
|
| 266 |
+ elif has_upload == '未上报' and temperature <= settings.FEVER_TEMPERATURE: |
|
| 267 |
+ eqpts_not_upload.append(eqpt) |
|
| 268 |
+ else: |
|
| 269 |
+ eqpts_other.append(eqpt) |
|
| 270 |
+ |
|
| 257 | 271 |
return {
|
| 258 |
- 'eqpts': eqpts, |
|
| 272 |
+ 'eqpts': eqpts_fever + eqpts_not_upload + eqpts_other, |
|
| 259 | 273 |
'reminds': reminds, |
| 260 | 274 |
'total_active_eqpt_num': total_active_eqpt_num, |
| 261 | 275 |
'has_upload_temperature_num': has_upload_temperature_num, |